js: Split gi imports to be on new lines to prepare for ES modules

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2794>

diff --git a/HACKING.md b/HACKING.md
index bdcb9ba934d28864974fe1433bad69ae270cd533..03e1134631e033ccbd21009127998fd0995b4898 100644 (file)
--- a/HACKING.md
+++ b/HACKING.md
@@ -79,7 +79,9 @@ e.g. `imports.ui.popupMenu`.
 Each import block should be sorted alphabetically. Don't import modules you
 don't use.
 ```javascript
-    const { GLib, Gio, St } = imports.gi;
+    const GLib = imports.gi.GLib;
+    const Gio = imports.gi.Gio;
+    const St = imports.gi.St;
 
     const Main = imports.ui.main;
     const Params = imports.misc.params;

diff --git a/js/gdm/authList.js b/js/gdm/authList.js
index 618cbe2d20b1e1bba3d448b43202d992245ac90f..a119f232a5ad06b247d085e5b4bce0d557ca4dee 100644 (file)
--- a/js/gdm/authList.js
+++ b/js/gdm/authList.js
@@ -17,7 +17,10 @@
  */
 /* exported AuthList */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const SCROLL_ANIMATION_TIME = 500;
 

diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 3cda93a4f5281246439734979b4d471913593e02..7dccb448f3eb5db8363c5f911369532e3de8dbe3 100644 (file)
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported AuthPrompt */
 
-const { Clutter, GLib, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const AuthList = imports.gdm.authList;

diff --git a/js/gdm/batch.js b/js/gdm/batch.js
index f841f0f8e959a8d2d984e724c27bdf80efdfeff7..771afe7e49664ed53dbbd37c8a65ebec3008d531 100644 (file)
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@@ -45,7 +45,7 @@
  */
 /* exported ConcurrentBatch, ConsecutiveBatch */
 
-const { GObject } = imports.gi;
+const GObject = imports.gi.GObject;
 const Signals = imports.misc.signals;
 
 var Task = class extends Signals.EventEmitter {

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 7e7d88493a721c77b3f1a2019dd9ae352a3ea8d0..5f8a32c36803216114f819b0ae3261adf2335900 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -17,10 +17,17 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const {
-    AccountsService, Atk, Clutter, Gdm, Gio,
-    GLib, GObject, Meta, Pango, Shell, St,
-} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 78c45cbbaa83fca000c5b23e2defc0e5f16dcb80..1d62517c313f8f2a5bedd41a1cf7702a52530d84 100644 (file)
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -3,7 +3,10 @@
             DISABLE_USER_LIST_KEY, fadeInActor, fadeOutActor, cloneAndFadeOutActor,
             ShellUserVerifier */
 
-const { Clutter, Gdm, Gio, GLib } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Signals = imports.misc.signals;
 
 const Batch = imports.gdm.batch;

diff --git a/js/misc/dbusUtils.js b/js/misc/dbusUtils.js
index ac26894eb194fbe4e0aeb0a4d31bcc542dfadbff..da358c7eea58ee799bf13a6dd3364b609a86a1ae 100644 (file)
--- a/js/misc/dbusUtils.js
+++ b/js/misc/dbusUtils.js
@@ -2,7 +2,8 @@
 /* exported loadInterfaceXML, loadSubInterfaceXML */
 
 const Config = imports.misc.config;
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 
 let _ifaceResource = null;
 

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index 97ea66e8250bf37cb7454f9ddd021f9bec5950d1..9df1f858a284a7c06694bcb28581f9ff1ee74e8a 100644 (file)
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -7,7 +7,8 @@
 // Common utils for the extension system and the extension
 // preferences tool
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 
 const Gettext = imports.gettext;
 

diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index 528a763501cc2466b9738d3f0fb7125af341547c..75f1ee59cde8cea139454ef21288e178d430a6e4 100644 (file)
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -2,7 +2,8 @@
 /* exported collectFromDatadirs, recursivelyDeleteDir,
             recursivelyMoveDir, loadInterfaceXML, loadSubInterfaceXML */
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 
 var { loadInterfaceXML } = imports.misc.dbusUtils;
 

diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index 969556dc2f306de16326b7ece5a8a1a7d1313765..02c9af82a4308d10b78cbdef7ec6acfb1d5bcf9b 100644 (file)
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getIBusManager */
 
-const { Gio, GLib, IBus, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const IBus = imports.gi.IBus;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 const Signals = imports.misc.signals;
 const BoxPointer = imports.ui.boxpointer;
 

diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
index e008e64116de4418eb5c6e37a6dc5bc27cac39f8..c3749114e5c7ca35e7468b5ddf74a18effffb3e4 100644 (file)
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -1,6 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported InputMethod */
-const { Clutter, GLib, Gio, GObject, IBus } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const IBus = imports.gi.IBus;
 
 const Keyboard = imports.ui.status.keyboard;
 const Main = imports.ui.main;

diff --git a/js/misc/introspect.js b/js/misc/introspect.js
index dcb158f0e72cbfd5af23476725dc7b27edf5f796..d55a2fe9d44d29002278da5aefaf81a9e19ca3bb 100644 (file)
--- a/js/misc/introspect.js
+++ b/js/misc/introspect.js
@@ -1,5 +1,9 @@
 /* exported IntrospectService */
-const { Gio, GLib, Meta, Shell, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const APP_ALLOWLIST = [
     'org.freedesktop.impl.portal.desktop.gtk',

diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index 142e2f41983cb336d7c46bd72eb046c208a45288..2f7e632cf5c9c9fc4af62af415b0158012edddc1 100644 (file)
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getKeyboardManager, holdKeyboard, releaseKeyboard */
 
-const { GLib, GnomeDesktop } = imports.gi;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
 
 const Main = imports.ui.main;
 

diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
index 94d62e8192f83f7fa64c2e60decf5a3104e0f298..6f3a8a55ed593136036e64d164f3f948449d9dfb 100644 (file)
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported canLock, getLoginManager, registerSessionWithGDM */
 
-const { GLib, Gio } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 const Signals = imports.misc.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;

diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index c31bf5b6bd4105e0565049887e10eaef0ddb6ba0..d6b906cf2637338523b3365402fd7f974ab6c575 100644 (file)
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ModemBase, ModemGsm, ModemCdma, BroadbandModem  */
 
-const {Gio, GObject, NM, NMA4} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const NM = imports.gi.NM;
+const NMA4 = imports.gi.NMA4;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 

diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index a1dcde3a7b4183ec474d1008a78103b79432ec20..b9827c45f0bc37a562e459731b29f95554a2eaf9 100644 (file)
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ObjectManager */
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Params = imports.misc.params;
 const Signals = imports.misc.signals;
 

diff --git a/js/misc/parentalControlsManager.js b/js/misc/parentalControlsManager.js
index 48f0ca2dd546f9feb2ae7b06a76050c4d3a1ec02..42b8e793fd021bcc502ce681d9abc8be42336927 100644 (file)
--- a/js/misc/parentalControlsManager.js
+++ b/js/misc/parentalControlsManager.js
@@ -23,7 +23,9 @@
 
 /* exported getDefault */
 
-const { Gio, GObject, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
 
 // We require libmalcontent ≥ 0.6.0
 const HAVE_MALCONTENT = imports.package.checkSymbol(

diff --git a/js/misc/signalTracker.js b/js/misc/signalTracker.js
index e4497e26aa48289a0d0449f087046ae179b11dbf..ba99411c41603fd01894c7abb6b7953d0c3f28b4 100644 (file)
--- a/js/misc/signalTracker.js
+++ b/js/misc/signalTracker.js
@@ -1,5 +1,5 @@
 /* exported TransientSignalHolder, connectObject, disconnectObject */
-const { GObject } = imports.gi;
+const GObject = imports.gi.GObject;
 
 const destroyableTypes = [];
 

diff --git a/js/misc/systemActions.js b/js/misc/systemActions.js
index 759862a44b852c9ed284acec6c66877ac565489d..ddc9560db49b5f30c50ad4b094cbda0e8fc6135c 100644 (file)
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -1,5 +1,10 @@
 /* exported getDefault */
-const {AccountsService, Clutter, Gdm, Gio, GLib, GObject} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;

diff --git a/js/misc/util.js b/js/misc/util.js
index e6065c446a8818ab0369a2aacc3af4c184ff3d0c..d1c43d2fe036c87e135dc35f4d69af7cdfa99ad2 100644 (file)
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -4,7 +4,12 @@
             ensureActorVisibleInScrollView, wiggle, lerp, GNOMEversionCompare,
             DBusSenderChecker, Highlighter */
 
-const { Clutter, Gio, GLib, Shell, St, GnomeDesktop } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const GnomeDesktop = imports.gi.GnomeDesktop;
 const Gettext = imports.gettext;
 
 const Main = imports.ui.main;

diff --git a/js/misc/weather.js b/js/misc/weather.js
index a01b832b8fbba6b1807a98c1d35c8edfd642e273..677f81c59959cd3056b39f8951df08be0641a3a7 100644 (file)
--- a/js/misc/weather.js
+++ b/js/misc/weather.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WeatherClient */
 
-const { Geoclue, Gio, GLib, GWeather, Shell } = imports.gi;
+const Geoclue = imports.gi.Geoclue;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GWeather = imports.gi.GWeather;
+const Shell = imports.gi.Shell;
 const Signals = imports.misc.signals;
 
 const PermissionStore = imports.misc.permissionStore;

diff --git a/js/perf/basic.js b/js/perf/basic.js
index 0f35af384b77661ef082d189b4d9d2b05dfa1acf..3fbc0514e74bf3774777056b72bfd29e29d5132e 100644 (file)
--- a/js/perf/basic.js
+++ b/js/perf/basic.js
@@ -5,7 +5,7 @@
 */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
 
-const { St } = imports.gi;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

diff --git a/js/perf/closeWithActiveWindows.js b/js/perf/closeWithActiveWindows.js
index 970de7d95ef68f84f4124e0eb0635f1c8561ab08..0a2a68f7dce83d53e41197d126edae739abe3c45 100644 (file)
--- a/js/perf/closeWithActiveWindows.js
+++ b/js/perf/closeWithActiveWindows.js
@@ -2,7 +2,7 @@
 /* exported run */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^malloc", "^glx", "^clutter"] }] */
 
-const {Clutter} = imports.gi;
+const Clutter = imports.gi.Clutter;
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

diff --git a/js/perf/headlessStart.js b/js/perf/headlessStart.js
index 0f18447e3e6cf9b6688a92fc7411a81698e585cf..1a427be91da29848f6c17c2b7a106db02ab981c3 100644 (file)
--- a/js/perf/headlessStart.js
+++ b/js/perf/headlessStart.js
@@ -4,7 +4,9 @@
 */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
 
-const {GLib, MetaTest, Shell} = imports.gi;
+const GLib = imports.gi.GLib;
+const MetaTest = imports.gi.MetaTest;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;

diff --git a/js/perf/hwtest.js b/js/perf/hwtest.js
index 63777bd9d066629123e72c3e347238e8609ca6b0..fab958702e16556e1412cf731d02f5068837934c 100644 (file)
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@@ -7,7 +7,9 @@
             script_geditLaunch, script_geditFirstFrame,
             clutter_stagePaintStart, clutter_paintCompletedTimestamp */
 /* eslint camelcase: ["error", { properties: "never", allow: ["^script_", "^clutter"] }] */
-const { Clutter, Gio, Shell } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 

diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js
index 1e296079c54867fdca829ddfb5b88efaaba23c12..23a385057ff05ac8fe682c45c9a0a495ce0cae85 100644 (file)
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -1,5 +1,11 @@
 /* exported AccessDialogDBus */
-const { Clutter, Gio, GLib, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index a3daebc20d276c83a02e1c3d114a5187e1824e75..7472729dfa4c407e392714948ccffe9f84f2a47b 100644 (file)
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -2,7 +2,14 @@
 /* exported AppSwitcherPopup, GroupCyclerPopup, WindowSwitcherPopup,
             WindowCyclerPopup */
 
-const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

diff --git a/js/ui/animation.js b/js/ui/animation.js
index b8d7f7beeb864b959a25134635c8626a30ad53a6..0a784413a7dc3ea2bcaaa4751afe850ae1a26930 100644 (file)
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Animation, AnimatedIcon, Spinner */
 
-const { Clutter, GLib, GObject, Gio, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 75a458f7b36ed45528d1c6f885bb60f14c565e58..372fcd56348f6634301919d42ac9dd3b2735b8ae 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1,9 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported AppDisplay, AppSearchProvider */
 
-const {
-    Clutter, Gio, GLib, GObject, Graphene, Pango, Shell, St,
-} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppFavorites = imports.ui.appFavorites;
 const { AppMenu } = imports.ui.appMenu;

diff --git a/js/ui/appMenu.js b/js/ui/appMenu.js
index fec74cf456ffcc86ccd061676a0406761438d5d7..81704759c3fd7946bb2b99495ab73e8ca02b66e9 100644 (file)
--- a/js/ui/appMenu.js
+++ b/js/ui/appMenu.js
@@ -1,6 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported AppMenu */
-const { Clutter, Gio, GLib, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppFavorites = imports.ui.appFavorites;
 const Main = imports.ui.main;

diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js
index b5ce8cbc2e29324751153aefbf27861d8d23bcf3..67a3eb9208be433256b07ea7dd330f7b3bd33072 100644 (file)
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -1,5 +1,11 @@
 /* exported AudioDeviceSelectionDBus */
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

diff --git a/js/ui/background.js b/js/ui/background.js
index a1f6601080834e5648404a8fc4c4c3755303cb19..9630508349bc25afaad206afd6fbb131dc39a4d9 100644 (file)
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -94,7 +94,14 @@
 //     MetaBackgroundImage         MetaBackgroundImage
 //     MetaBackgroundImage         MetaBackgroundImage
 
-const {Clutter, GDesktopEnums, Gio, GLib, GObject, GnomeBG, GnomeDesktop, Meta} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const GnomeBG = imports.gi.GnomeBG;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Meta = imports.gi.Meta;
 const Signals = imports.misc.signals;
 
 const LoginManager = imports.misc.loginManager;

diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
index 6282f308b540b637dfa9fb7b4f28e27ae0f628c3..6725cc302db9153e7e6ec379fdcf7e1c717b7f3e 100644 (file)
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported addBackgroundMenu */
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/barLevel.js b/js/ui/barLevel.js
index 25d4835280acda6964609b1d8bb6c17649f3a62f..50dfe8bddfd314534e6b4e0aed99538fb141105f 100644 (file)
--- a/js/ui/barLevel.js
+++ b/js/ui/barLevel.js
@@ -1,7 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported BarLevel */
 
-const { Atk, Clutter, GObject, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 var BarLevel = GObject.registerClass({
     Properties: {

diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 3987d62a27953468716b04b89728d37ca2ecec5e..bcd8a4c07d83fbd990833ddeb416485470e22036 100644 (file)
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported BoxPointer */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 078f316917af31f7f2de02975a043e1592bc9ada..673c4c05a67b4a7859435db06bc6653cc933ca20 100644 (file)
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Calendar, CalendarMessageList, DBusEventSource */
 
-const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;

diff --git a/js/ui/checkBox.js b/js/ui/checkBox.js
index d64bd0d6c23634db3bea70b69d5555a439d48987..882f127112503e3302b29f89e8a954cc78ea0847 100644 (file)
--- a/js/ui/checkBox.js
+++ b/js/ui/checkBox.js
@@ -1,5 +1,9 @@
 /* exported CheckBox */
-const { Atk, Clutter, GObject, Pango, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 var CheckBox = GObject.registerClass(
 class CheckBox extends St.Button {

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index ace93b8f0369cfd1cc95cde9b8f6c6e229698e6d..314ac7c72cb96f198b037d4eb40dca599036763e 100644 (file)
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported CloseDialog */
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 4c0c22305bd4c57b3301b51b417645e63aa21af9..c81d7e441297e36c530b786ba414c778e461c3c8 100644 (file)
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Gio, GLib } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Params = imports.misc.params;
 
 const GnomeSession = imports.misc.gnomeSession;

diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index b02474a1f06b48098dcb33b7cce8be9ef5dd71eb..cd9f697dc8b35187f67849a14bdb1c531435b729 100644 (file)
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gio, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index cd7a81e9579e62d991a1537b409331fe0f6f358e..e4d0ad85f3820f96c7daaafdaaf1d236b3538ae9 100644 (file)
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gcr, Gio, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gcr = imports.gi.Gcr;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index ba02f88bec19799eaa1834cc091ab9d36a08dfe9..9f8b238243ac5b63cb953a6971526a7536d4fe65 100644 (file)
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -1,7 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const NM = imports.gi.NM;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 1da02e5b4dfcf48aac46c1f17828ef63c0a31b54..65c4dff71ac06b7c6d59657d2d0d1bc3c089619f 100644 (file)
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -1,10 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const {
-    AccountsService, Clutter, GLib, GObject,
-    Pango, PolkitAgent, Polkit, Shell, St,
-} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const PolkitAgent = imports.gi.PolkitAgent;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index d31782245143ce974ec5b099a98a7aeb350fbfea..b1d07b8d2c3121085c16c212b87e92fa3db3fca5 100644 (file)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Component */
 
-const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 var Tpl = null;
 var Tp = null;

diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 421fecf37f8020d720ffcdc78cd48794c6bbac9d..97d72c2e5e64237b4a941667624ee98372c5d764 100644 (file)
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported CtrlAltTabManager */
 
-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 188308853f353e6c2a2e61c018204379766b29c1..581054b69dd9445b7156e00ffcc081a48511f4df 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dash */
 
-const { Clutter, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 96458d2fdfbfa8b11bd2d13f3c026e08dc29f4fa..e7bdb6dbb9bcd7a8b52481eb66e299cb07b015b4 100644 (file)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -1,10 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported DateMenuButton */
 
-const {
-    Clutter, Gio, GLib, GnomeDesktop,
-    GObject, GWeather, Pango, Shell, St,
-} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const GObject = imports.gi.GObject;
+const GWeather = imports.gi.GWeather;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Util = imports.misc.util;
 const Main = imports.ui.main;

diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index 22e6a1b6edaaa6e30bbbeb9d7a45cd3f96b3c1f4..d15782c088050e589b4c37343b866d958a44dab5 100644 (file)
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dialog, MessageDialogContent, ListSection, ListSectionItem */
 
-const { Clutter, GLib, GObject, Meta, Pango, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 function _setLabel(label, value) {
     label.set({

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 53b4fde6c04709fe07c000b6ee3a24749e70dd3b..457a66a919a93339b8508abff1b1918fa83d785b 100644 (file)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported addDragMonitor, removeDragMonitor, makeDraggable */
 
-const { Clutter, GLib, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/edgeDragAction.js b/js/ui/edgeDragAction.js
index 25d1d3fb2d848a05547970d6a4807f73a6314f35..e35b5e2fc6f36f94e82cb709b4b5fbeac6fe2c8a 100644 (file)
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported EdgeDragAction */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 3de1085ab0def645a756819e5bfa6e880169e0c8..93d8d5c2f6ee6a60c89d832ba4b232e73f7bc20a 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -17,10 +17,16 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-const {
-    AccountsService, Clutter, Gio, GLib, GObject,
-    Pango, Polkit, Shell, St, UPowerGlib: UPower,
-} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const UPower = imports.gi.UPowerGlib;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/environment.js b/js/ui/environment.js
index 09c9f031dcdd81759f49cbf2bda1f8589990da99..3b8cd82339653454f5d0d282f8ffb220f3614fe0 100644 (file)
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -33,7 +33,15 @@ imports.gi.versions.TelepathyGLib = '0.12';
 imports.gi.versions.TelepathyLogger = '0.2';
 imports.gi.versions.UPowerGlib = '1.0';
 
-const {Clutter, Gdk, Gio, GLib, GObject, Meta, Polkit, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gdk = imports.gi.Gdk;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Gettext = imports.gettext;
 const System = imports.system;
 const SignalTracker = imports.misc.signalTracker;

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 197cc1c1cf98232d365d210dd51a5ff4da346af1..317a13e625ed7860bb8297df7e38f6b499618486 100644 (file)
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported init, installExtension, uninstallExtension, checkForUpdates */
 
-const { Clutter, Gio, GLib, GObject, Soup } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Soup = imports.gi.Soup;
 
 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index dd2f44ebbcd4f3d24843084740de2012480c87e9..9c36a827520f3fff60f28911c2d1771d727bf39e 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported init connect disconnect ExtensionManager */
 
-const { GLib, Gio, GObject, Shell, St } = imports.gi;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const ExtensionDownloader = imports.ui.extensionDownloader;

diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 650bec48d21b7f5a14e53148b6235b2a7afb323d..4ac5a01d5b75e6b0cc1648e78b812f0332cb8f07 100644 (file)
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported GrabHelper */
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js
index 6d7c0e0fa9e4a05ef65d201f374986018011cf95..8d9b318055c22009deb308beb45a2dd37d53654c 100644 (file)
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported CandidatePopup */
 
-const { Clutter, GObject, IBus, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const IBus = imports.gi.IBus;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 01d57e0fc8a968ab46b7fb8a678ddb842311c177..c239e27d217892665528c525045b54991d6c86a6 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported BaseIcon, IconGrid, IconGridLayout */
 
-const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 const Main = imports.ui.main;

diff --git a/js/ui/inhibitShortcutsDialog.js b/js/ui/inhibitShortcutsDialog.js
index 2a3e1aece33514c7916fa47060c2143f62e8013e..95205efefc40216ec9c7ba9b6c567ac311310454 100644 (file)
--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@@ -1,5 +1,10 @@
 /* exported InhibitShortcutsDialog */
-const {Clutter, GObject, Meta, Pango, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

diff --git a/js/ui/kbdA11yDialog.js b/js/ui/kbdA11yDialog.js
index 6d1608c1e7ccbfae8924e76bcfcc0e5a06b19026..06831f688dff97ad8174c7896e4bbffda34329b9 100644 (file)
--- a/js/ui/kbdA11yDialog.js
+++ b/js/ui/kbdA11yDialog.js
@@ -1,5 +1,8 @@
 /* exported KbdA11yDialog */
-const { Clutter, Gio, GObject, Meta } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 288703b3d28d409fcc63fbe0790d4343001a0a1c..f3eb96a79a60e8fad25c93451469e2de1f7562d0 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1,7 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported KeyboardManager */
 
-const {Clutter, Gio, GLib, GObject, Graphene, IBus, Meta, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const IBus = imports.gi.IBus;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const EdgeDragAction = imports.ui.edgeDragAction;

diff --git a/js/ui/layout.js b/js/ui/layout.js
index d7f73dcaca24dd1158326df7741cb891f527dbaa..3d0f2c5fff7dd84e3d12ba5032e89169771e2704 100644 (file)
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported MonitorConstraint, LayoutManager */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Background = imports.ui.background;

diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index b0ca77a6d23503a386e9e2d0d0c11ee9af14c1b1..1b02958b1ab629cc03d79fca3bb2ce4456927839 100644 (file)
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Lightbox */
 
-const { Clutter, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 

diff --git a/js/ui/locatePointer.js b/js/ui/locatePointer.js
index 6ae29419a3decf59e617bc619a535b8f234342f3..524aae668e4c21a4a4e69c9d6e50db6b0739fe4d 100644 (file)
--- a/js/ui/locatePointer.js
+++ b/js/ui/locatePointer.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported LocatePointer */
 
-const { Gio } = imports.gi;
+const Gio = imports.gi.Gio;
 const Ripples = imports.ui.ripples;
 const Main = imports.ui.main;
 

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 93cb88862359b18a7904ed4d0b971f525ae02b11..6063b17400ae7304d99592f2c92821564ffd5d39 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1,9 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported LookingGlass */
 
-const {
-    Clutter, Cogl, Gio, GLib, GObject, Graphene, Meta, Pango, Shell, St,
-} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Cogl = imports.gi.Cogl;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 const System = imports.system;
 

diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index bd6904758dfa3dcfef70a468d7f1a992782b1b2e..3358d5aaae067b1bc8ab2520d4e150861bf90f0d 100644 (file)
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -1,9 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Magnifier */
 
-const {
-    Atspi, Clutter, GDesktopEnums, Gio, GLib, GObject, Meta, Shell, St,
-} = imports.gi;
+const Atspi = imports.gi.Atspi;
+const Clutter = imports.gi.Clutter;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Background = imports.ui.background;

diff --git a/js/ui/main.js b/js/ui/main.js
index 88e2e85d3a1796d323838a1155c4d74c1e3f1736..5cc6a1ce2424fa5cffc1e7f665f4e9bf0297322a 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -9,7 +9,13 @@
             createLookingGlass, initializeDeferredWork,
             getStyleVariant, getThemeStylesheet, setThemeStylesheet, screenshotUI */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AccessDialog = imports.ui.accessDialog;
 const AudioDeviceSelection = imports.ui.audioDeviceSelection;

diff --git a/js/ui/messageList.js b/js/ui/messageList.js
index 29e76752b8c15d53366249aa1c72275cce0eeb98..b77cf0961dc1a8475a269d7e0b4064b38f6796d0 100644 (file)
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -1,7 +1,13 @@
 /* exported MessageListSection */
-const {
-    Atk, Clutter, Gio, GLib, GObject, Graphene, Meta, Pango, St,
-} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 1edd932f63fb56a9f92247fef714ea111b98124f..ca67d009285cead3a2a15732fea5f07b2364b689 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -3,7 +3,13 @@
    NotificationApplicationPolicy, Source, SourceActor,
    SystemNotificationSource, MessageTray */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Calendar = imports.ui.calendar;
 const GnomeSession = imports.misc.gnomeSession;

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 0561b8b155a3adb15f716f40c3a4ba065eb4ec9b..7ddef070b8be7c11b5da8aaeb5e349a52c33f50b 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ModalDialog */
 
-const { Atk, Clutter, GObject, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Layout = imports.ui.layout;

diff --git a/js/ui/mpris.js b/js/ui/mpris.js
index 2ccd0c44ba895875eadcadea9ab4ac0a070fd6bf..6ccf88de929ac78f4d080c70ec6b8ec686a5c233 100644 (file)
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -1,5 +1,8 @@
 /* exported MediaSection */
-const { Gio, GObject, Shell, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 22e716220cf6a72dfc5414cb01975ef21c2ca926..7a8d61e482112d7228b1a1f9dc0c8db0bb0e1a3b 100644 (file)
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported NotificationDaemon */
 
-const { GdkPixbuf, Gio, GLib, GObject, Shell, St } = imports.gi;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const Main = imports.ui.main;

diff --git a/js/ui/osdMonitorLabeler.js b/js/ui/osdMonitorLabeler.js
index 31d99c14030c4455bc992b66b2465f9710c79166..8f4e53b46d28c616c10b615734498c48b4b527ff 100644 (file)
--- a/js/ui/osdMonitorLabeler.js
+++ b/js/ui/osdMonitorLabeler.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported OsdMonitorLabeler */
 
-const { Clutter, Gio, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index b1833336135bd675a52e2fba81314911c2165600..3891325ca2760d5cda56bbcb3abb5d50a2328c66 100644 (file)
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported OsdWindowManager */
 
-const { Clutter, GLib, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const BarLevel = imports.ui.barLevel;
 const Layout = imports.ui.layout;

diff --git a/js/ui/overview.js b/js/ui/overview.js
index 3bd62afe1f870c6194757f8840a9f3736e1c55b0..f0fd2b9d67615ed462382194cdc1f6a9312d037e 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Overview, ANIMATION_TIME */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 // Time for initial animation going into Overview mode;

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 05898955da99c44bb44d46c6a9f39b4e7d13dd35..59d70e40643ddc92ab239e7cd666ea9860cb7804 100644 (file)
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ControlsManager */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const Dash = imports.ui.dash;

diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 33d5a87f13ea8ce159115feef027eacb494e2fe6..364cc16e927c6b3e537d3d64ebca7e5d5978be4a 100644 (file)
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -1,10 +1,17 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported PadOsd, PadOsdService */
 
-const {
-    Atk, Clutter, GDesktopEnums, Gio,
-    GLib, GObject, Meta, Pango, Rsvg, St,
-} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Rsvg = imports.gi.Rsvg;
+const St = imports.gi.St;
+
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/pageIndicators.js b/js/ui/pageIndicators.js
index 18a376cba0389c9bc5bfa19d8fb5aaf975daaaea..02f64470ec6a464fe30e0bf63364fbf5420a52dc 100644 (file)
--- a/js/ui/pageIndicators.js
+++ b/js/ui/pageIndicators.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported PageIndicators */
 
-const { Clutter, Graphene, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Graphene = imports.gi.Graphene;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const INDICATOR_INACTIVE_OPACITY = 128;
 const INDICATOR_INACTIVE_OPACITY_HOVER = 255;

diff --git a/js/ui/panel.js b/js/ui/panel.js
index dff70ca143cde853b4289366e825c989adbd14bc..13243350661c5be580635e942742b88c63972393 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Panel */
 
-const { Atk, Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const { AppMenu } = imports.ui.appMenu;

diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index a5445ce87dcd3762ad24130c1e231d58f8eedd4a..963f9f273fa6a3dfa643ac024f513c59c90424cf 100644 (file)
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Button, SystemIndicator */
 
-const { Atk, Clutter, GObject, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

diff --git a/js/ui/pointerA11yTimeout.js b/js/ui/pointerA11yTimeout.js
index 263cc3eaf2346770e61a02d630604f378af69fbf..6a4eef246ea8216ca90fb125b1e85ac24aa445b5 100644 (file)
--- a/js/ui/pointerA11yTimeout.js
+++ b/js/ui/pointerA11yTimeout.js
@@ -1,5 +1,8 @@
 /* exported PointerA11yTimeout */
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 const Main = imports.ui.main;
 const Cairo = imports.cairo;
 

diff --git a/js/ui/pointerWatcher.js b/js/ui/pointerWatcher.js
index 2af35b617312e10c64fb7fb52894a5778a4187cd..c346bb07ef7cce0da71d36903b296a39135c000d 100644 (file)
--- a/js/ui/pointerWatcher.js
+++ b/js/ui/pointerWatcher.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getPointerWatcher */
 
-const { GLib } = imports.gi;
+const GLib = imports.gi.GLib;
 
 // We stop polling if the user is idle for more than this amount of time
 var IDLE_TIME = 1000;

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 8565036aa0c439766b02042a990e6692ea4c078d..32c384b8c91593354394dde0d6a42c56f566fe44 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -3,7 +3,13 @@
             PopupImageMenuItem, PopupMenu, PopupDummyMenu, PopupSubMenu,
             PopupMenuSection, PopupSubMenuMenuItem, PopupMenuManager */
 
-const { Atk, Clutter, Gio, GObject, Graphene, Shell, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.misc.signals;
 
 const BoxPointer = imports.ui.boxpointer;

diff --git a/js/ui/quickSettings.js b/js/ui/quickSettings.js
index 64aa8941b144a46540b3495f5d86b1e98a51ccc0..7f08d6f7541ccbd86d07f2c8690be6f942d4fa90 100644 (file)
--- a/js/ui/quickSettings.js
+++ b/js/ui/quickSettings.js
@@ -1,5 +1,13 @@
 /* exported QuickToggle, QuickMenuToggle, QuickSlider, QuickSettingsMenu, SystemIndicator */
-const {Atk, Clutter, Gio, GLib, GObject, Graphene, Meta, Pango, St} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index 592dfe199b936bc0aef5b92ee568aa594d0105c7..eef475227186c97b8acf8342abe435826e777331 100644 (file)
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported loadRemoteSearchProviders */
 
-const { GdkPixbuf, Gio, GLib, Shell, St } = imports.gi;
+const GdkPixbuf = imports.gi.GdkPixbuf;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const FileUtils = imports.misc.fileUtils;
 

diff --git a/js/ui/ripples.js b/js/ui/ripples.js
index 20ca9ed9f6808e33ee06b2d6b7935a1580335faf..f27274ae44a1343009e56bf40f028769b7e63d59 100644 (file)
--- a/js/ui/ripples.js
+++ b/js/ui/ripples.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Ripples */
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 // Shamelessly copied from the layout "hotcorner" ripples implementation
 var Ripples = class Ripples {

diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index fe9b33e9c42c20ff9e4213eeed7b06e669e4aba1..0398e303ef3b41287024e511a1b3a56916cfe095 100644 (file)
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported RunDialog */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index b6c3c554745de5269ad965b0abd3ed8a86c3953b..d4eba58fdb912909c2205f8b3420eeaece8cb24a 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1,10 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ScreenShield */
 
-const {
-    AccountsService, Clutter, Gio,
-    GLib, Graphene, Meta, Shell, St,
-} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
 const Signals = imports.misc.signals;
 
 const GnomeSession = imports.misc.gnomeSession;

diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js
index 91c9635e7d121e9436623977df7a08605374c06b..9c57f0015d064cdd51d453543f01bfe6e9587b4d 100644 (file)
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -1,7 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ScreenshotService, ScreenshotUI, showScreenshotUI, captureScreenshot */
 
-const {Clutter, Cogl, Gio, GObject, GLib, Graphene, Meta, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Cogl = imports.gi.Cogl;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const GLib = imports.gi.GLib;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const GrabHelper = imports.ui.grabHelper;
 const Layout = imports.ui.layout;

diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index 545db8531e0753512a088cbb4e048f0786938c48..35373489923e61ddf85d71d8efaa1df5198b4123 100644 (file)
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -3,7 +3,10 @@
             destroyTestWindows, defineScriptEvent, scriptEvent,
             collectStatistics, runPerfScript, disableHelperAutoExit */
 
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const Main = imports.ui.main;

diff --git a/js/ui/search.js b/js/ui/search.js
index 7d50ef2346d78ac18a7211985174f5654dc34ed2..fc71f2143ce0ba4464f8d499f25173753862b2b6 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SearchResultsView */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const IconGrid = imports.ui.iconGrid;

diff --git a/js/ui/searchController.js b/js/ui/searchController.js
index 9864b8df62955849bb6e56eef7a1cd90c4886bc3..3a290fc171e9a86c5082641d28bd4a3fefa31a75 100644 (file)
--- a/js/ui/searchController.js
+++ b/js/ui/searchController.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SearchController */
 
-const { Clutter, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const Search = imports.ui.search;

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 244214e8c0743d3821e54bd0f3934e1c939976b1..8ee4e9b4348ea7630f62ddb691121ff2a77bc7cc 100644 (file)
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported GnomeShell, ScreenSaverDBus */
 
-const { Gio, GLib, Meta, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionDownloader = imports.ui.extensionDownloader;

diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index e6c1f3796b4818fab74b98ba96689624fe0bfb0a..dab23ff86c56c1cfe48833efa7561dd8f658293a 100644 (file)
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported addContextMenu CapsLockWarning */
 
-const { Clutter, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 00498763b7b6cb27bbb0fef19b0ff895effdb238..30db22fede5d18f2f827d024f3e70d87489e60df 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ShellMountOperation, GnomeShellMountOpHandler */
 
-const { Clutter, Gio, GLib, GObject, Pango, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
 const CheckBox = imports.ui.checkBox;

diff --git a/js/ui/slider.js b/js/ui/slider.js
index 6ca76fec0b1605a5e9e199f3b9398667c24bd640..797d84c98f92dc2313da4fc5701b175cbf49d56a 100644 (file)
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -1,7 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* exported Slider */
 
-const { Atk, Clutter, GObject } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
 
 const BarLevel = imports.ui.barLevel;
 

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 5d02b97ccd96f5ac7cec73e48dff06e1880e2b82..a65b2bb6e46ee2ac2f1d2313c96018a13a6d02f6 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported ATIndicator */
 
-const { Gio, GLib, GObject, St } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/status/autoRotate.js b/js/ui/status/autoRotate.js
index 5618945b7e93beeb898bd039f07518d44242c45f..28ef04a29a0363f60f88685b4a651c85d18c58f2 100644 (file)
--- a/js/ui/status/autoRotate.js
+++ b/js/ui/status/autoRotate.js
@@ -1,5 +1,7 @@
 /* exported Indicator */
-const {Gio, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+
 
 const SystemActions = imports.misc.systemActions;
 

diff --git a/js/ui/status/backgroundApps.js b/js/ui/status/backgroundApps.js
index f2bee88845cc59505b3c9aa6a560e87b53956b8e..c5a339700a0650197f98e0e60ae6c2e82c014e53 100644 (file)
--- a/js/ui/status/backgroundApps.js
+++ b/js/ui/status/backgroundApps.js
@@ -1,5 +1,10 @@
 /* exported Indicator */
-const {Clutter, Gio, GLib, GObject, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 2977a4d949d15fed0f5a58cb80319ddef5a251a9..4ab716a0cc90d923176e28e74be2f7aa4b7d857a 100644 (file)
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GLib, GnomeBluetooth, GObject, Pango, St} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeBluetooth = imports.gi.GnomeBluetooth;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
+const St = imports.gi.St;
 
 const {Spinner} = imports.ui.animation;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/status/brightness.js b/js/ui/status/brightness.js
index 4c0da67d989aa79dacbf62920fb1b2c460d7e124..38b3f998b7cfbab283f6e717f5b5f04a75d0c54e 100644 (file)
--- a/js/ui/status/brightness.js
+++ b/js/ui/status/brightness.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+
 
 const {QuickSlider, SystemIndicator} = imports.ui.quickSettings;
 

diff --git a/js/ui/status/darkMode.js b/js/ui/status/darkMode.js
index d4620f0843aff6a936d8406139c65a609de27a03..9f4127a02a73c6098eaec75dbea352b68dcb7e2e 100644 (file)
--- a/js/ui/status/darkMode.js
+++ b/js/ui/status/darkMode.js
@@ -1,5 +1,7 @@
 /* exported Indicator */
-const {Gio, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+
 
 const Main = imports.ui.main;
 const {QuickToggle, SystemIndicator} = imports.ui.quickSettings;

diff --git a/js/ui/status/dwellClick.js b/js/ui/status/dwellClick.js
index 82726e5b68881122ed8fc38e77e6432926265b2f..66ca83a074267afb74d95f4d2627116215a3f528 100644 (file)
--- a/js/ui/status/dwellClick.js
+++ b/js/ui/status/dwellClick.js
@@ -1,5 +1,9 @@
 /* exported DwellClickIndicator */
-const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const PanelMenu = imports.ui.panelMenu;
 

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index fff4e73c2947ab7224153b8749433d7e7b0578d1..d570cb47180b8242fedd5f4893daccb70516698e 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -1,7 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported InputSourceIndicator */
 
-const { Clutter, Gio, GLib, GObject, IBus, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const IBus = imports.gi.IBus;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Gettext = imports.gettext;
 const Signals = imports.misc.signals;
 

diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index 45f6b7ac8add4d0c4c6a0c55cf3976e0c12b902d..a234bcfc093fac9f8620c9b8771931b08da0d634 100644 (file)
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const { Clutter, Gio, GLib, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index a1ef22bef0316a8285de2360039a258af2ec4718..d73b37cea16d095b59f5496199a8a00ad1048074 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1,6 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
-const {Atk, Clutter, Gio, GLib, GObject, NM, Polkit, St} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const NM = imports.gi.NM;
+const Polkit = imports.gi.Polkit;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/status/nightLight.js b/js/ui/status/nightLight.js
index 5512eaa4aa5cd3a38e7b001cfbad8fd92b43f53d..1dbd59f07bb33d1738a2f2fa46b3e5dcad3658fb 100644 (file)
--- a/js/ui/status/nightLight.js
+++ b/js/ui/status/nightLight.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GLib, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 
 const {QuickToggle, SystemIndicator} = imports.ui.quickSettings;
 

diff --git a/js/ui/status/powerProfiles.js b/js/ui/status/powerProfiles.js
index 5cd9e2c650002e9a273d2c8fabfaebb577b2de42..566874ee0e13f6f4e66400df2e56aa436dfea6c2 100644 (file)
--- a/js/ui/status/powerProfiles.js
+++ b/js/ui/status/powerProfiles.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+
 
 const {QuickMenuToggle, SystemIndicator} = imports.ui.quickSettings;
 

diff --git a/js/ui/status/remoteAccess.js b/js/ui/status/remoteAccess.js
index 93980dcccc986f60a2f3ec99e62beba58b101e81..1a0451bf762801dfb62e1de4da22f594aba73d8a 100644 (file)
--- a/js/ui/status/remoteAccess.js
+++ b/js/ui/status/remoteAccess.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported RemoteAccessApplet, ScreenRecordingIndicator, ScreenSharingIndicator */
 
-const { Atk, Clutter, GLib, GObject, Meta, St } = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;

diff --git a/js/ui/status/rfkill.js b/js/ui/status/rfkill.js
index b51389298049e8d8d19305bde449b21aa350873a..edc8a9aa983554314abf22fa88ec7e9b738ec8bf 100644 (file)
--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Gio, GLib, GObject} = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
 
 const {QuickToggle, SystemIndicator} = imports.ui.quickSettings;
 

diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index d57e2786a69f93f17d2eeaea017713bf7feca9bf..b4f96eb6e0553f7968e0cc002c76249a02d133ef 100644 (file)
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -1,7 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St, UPowerGlib: UPower} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const UPower = imports.gi.UPowerGlib;
 
 const SystemActions = imports.misc.systemActions;
 const Main = imports.ui.main;

diff --git a/js/ui/status/thunderbolt.js b/js/ui/status/thunderbolt.js
index 2e1236e594287c65947b2cfe53c93abcb976fca6..0ec4dab12916a0c2923a5b697e8711f516a34cb0 100644 (file)
--- a/js/ui/status/thunderbolt.js
+++ b/js/ui/status/thunderbolt.js
@@ -3,7 +3,11 @@
 
 // the following is a modified version of bolt/contrib/js/client.js
 
-const { Gio, GLib, GObject, Polkit, Shell } = imports.gi;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Polkit = imports.gi.Polkit;
+const Shell = imports.gi.Shell;
 const Signals = imports.misc.signals;
 
 const Main = imports.ui.main;

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 91706343a2524ee65564007350dd9d58dfeed6dd..bc591ac09ab974aee68786e18a1c8a93d94d52e8 100644 (file)
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Indicator */
 
-const {Clutter, Gio, GLib, GObject, Gvc} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gvc = imports.gi.Gvc;
 
 const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;

diff --git a/js/ui/swipeTracker.js b/js/ui/swipeTracker.js
index 92990142b5d0cab12f3bf2bedc25e42462b0c154..77ea6c273c912922379c4cd7515447ba7a6e8395 100644 (file)
--- a/js/ui/swipeTracker.js
+++ b/js/ui/swipeTracker.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SwipeTracker */
 
-const { Clutter, Gio, GObject, Meta } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
 
 const Main = imports.ui.main;
 const Params = imports.misc.params;

diff --git a/js/ui/switchMonitor.js b/js/ui/switchMonitor.js
index 4e00eb3c0feb802af9e49f215606c47d808f1afd..767b9a1f25826aa42a5c56a8200360104c0f4b6d 100644 (file)
--- a/js/ui/switchMonitor.js
+++ b/js/ui/switchMonitor.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SwitchMonitorPopup */
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const SwitcherPopup = imports.ui.switcherPopup;
 

diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index 4b0479b6d710a65df3cee45b7e36a2d127cdd86a..4478b94f4894cd3650ced2454b5993f23d0c0f19 100644 (file)
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SwitcherPopup, SwitcherList */
 
-const { Clutter, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
 

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 5edcfc53fb024b9248302379165ea99fbca548a2..0cb0a3da202fe317ba579518bd8012fad2c1f591 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -1,10 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported UnlockDialog */
 
-const {
-    AccountsService, Atk, Clutter, Gdm, Gio,
-    GnomeDesktop, GLib, GObject, Shell, St,
-} = imports.gi;
+const AccountsService = imports.gi.AccountsService;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const Layout = imports.ui.layout;

diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index 76139e1f25f640d1ed801f165694ebbbc479bc62..7de238fd3001b12573e7c6e53d61b5e1e183965d 100644 (file)
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -3,7 +3,10 @@
 // A widget showing the user avatar and name
 /* exported UserWidget */
 
-const { Clutter, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Params = imports.misc.params;
 

diff --git a/js/ui/welcomeDialog.js b/js/ui/welcomeDialog.js
index 63c6d9061cce267ebae626af667e0ed836c03d94..fdee845f8afea5eed14b542136a1b690b98dd500 100644 (file)
--- a/js/ui/welcomeDialog.js
+++ b/js/ui/welcomeDialog.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WelcomeDialog */
 
-const { Clutter, GObject, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;

diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
index 8da30498ffdb6e947b85a671ef262246db76b5a1..c66f6c658f46f9cb6f727621354157798c2adc3c 100644 (file)
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -1,7 +1,8 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WindowAttentionHandler */
 
-const { GObject, Shell } = imports.gi;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 5a577dfed4765bbcc9e7974dc700ac70760f3764..a25fdc51ac1a4c7c2d9ea56569d2ac8ea0409f5e 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WindowManager */
 
-const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const AltTab = imports.ui.altTab;
 const AppFavorites = imports.ui.appFavorites;

diff --git a/js/ui/windowMenu.js b/js/ui/windowMenu.js
index 83699d0cd370c16114593a4c888af372d21d8ce1..a58ee79498bc1cb1cc0ea787653e8981cff7694c 100644 (file)
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -1,7 +1,9 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*
 /* exported WindowMenuManager */
 
-const {Clutter, Meta, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;

diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js
index 599759a1ba214c526a0c69c2a6570673191edec2..9845715203d2bfdd27278e5cab6285d7f4005d65 100644 (file)
--- a/js/ui/windowPreview.js
+++ b/js/ui/windowPreview.js
@@ -1,9 +1,15 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WindowPreview */
 
-const {
-    Atk, Clutter, GLib, GObject, Graphene, Meta, Pango, Shell, St,
-} = imports.gi;
+const Atk = imports.gi.Atk;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Pango = imports.gi.Pango;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const DND = imports.ui.dnd;
 const OverviewControls = imports.ui.overviewControls;

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index bf631a5f068e2b26b94b429bd85fa46feac69eda..b59e92f6450083ba590af823b27ba4f95bbba6a8 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1,7 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Workspace */
 
-const {Clutter, GLib, GObject, Graphene, Meta, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;

diff --git a/js/ui/workspaceAnimation.js b/js/ui/workspaceAnimation.js
index 432044f7592b84099c7fb1c44ca33489b048f20c..5c7f41b5f83d313706eb0e941092a5a37e57fc67 100644 (file)
--- a/js/ui/workspaceAnimation.js
+++ b/js/ui/workspaceAnimation.js
@@ -1,7 +1,11 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WorkspaceAnimationController, WorkspaceGroup */
 
-const { Clutter, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Background = imports.ui.background;
 const Layout = imports.ui.layout;

diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index 87445298be257f58113f693207ee4fea6e63ca3a..1342679254843853e203f284700966d644cdf767 100644 (file)
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -1,7 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WorkspaceSwitcherPopup */
 
-const { Clutter, GLib, GObject, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;

diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 5ff19c9a1e4320a4fab5df8575059852703c1b67..8a2abb2db04e621ad87a0002c98e0a1e17f3d910 100644 (file)
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -1,7 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WorkspaceThumbnail, ThumbnailsBox */
 
-const { Clutter, Gio, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Graphene = imports.gi.Graphene;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 22e66f77ad0333861b928e130c7b0406f5563828..4e42977dfcb016dbf4dca223301ecd6348b3804e 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -1,7 +1,12 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported WorkspacesView, WorkspacesDisplay */
 
-const { Clutter, Gio, GObject, Meta, Shell, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;

diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index 3a4880b419ad1913cefd6657cb1deeef02e909f2..d610f6396588e1d92e9cc3c9cbb43ca7dd1de938 100644 (file)
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported XdndHandler */
 
-const { Clutter } = imports.gi;
+const Clutter = imports.gi.Clutter;
 const Signals = imports.misc.signals;
 
 const DND = imports.ui.dnd;

diff --git a/subprojects/extensions-tool/src/templates/indicator/extension.js b/subprojects/extensions-tool/src/templates/indicator/extension.js
index 9ed2c385ca3c7bd2dcb9804aa7d8e580186602d6..2f6684be1125971187c3b9ba35d2e4641a367aab 100644 (file)
--- a/subprojects/extensions-tool/src/templates/indicator/extension.js
+++ b/subprojects/extensions-tool/src/templates/indicator/extension.js
@@ -20,7 +20,8 @@
 
 const GETTEXT_DOMAIN = 'my-indicator-extension';
 
-const { GObject, St } = imports.gi;
+const GObject = imports.gi.GObject;
+const St = imports.gi.St;
 
 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;

diff --git a/tests/interactive/background-repeat.js b/tests/interactive/background-repeat.js
index 1377f742494715f4399bf7db8ec62327103840e4..2b83411c4129085defcc32b516de897cf353c76b 100644 (file)
--- a/tests/interactive/background-repeat.js
+++ b/tests/interactive/background-repeat.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/background-size.js b/tests/interactive/background-size.js
index 4eaacf682472765d747df3c1d99ce2851f4ecefc..39c3bd8f4c063befde6788d3f910e560c9fb7ac9 100644 (file)
--- a/tests/interactive/background-size.js
+++ b/tests/interactive/background-size.js
@@ -2,7 +2,10 @@
 
 const UI = imports.testcommon.ui;
 
-const { Cogl, Clutter, Meta, St } = imports.gi;
+const Cogl = imports.gi.Cogl;
+const Clutter = imports.gi.Clutter;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
 
 
 function test() {

diff --git a/tests/interactive/border-radius.js b/tests/interactive/border-radius.js
index 4d26518bdc7c5b1a13891587f84c2eee88005b47..3b7d3d306cea641e0e155edc7d22d78ab430f453 100644 (file)
--- a/tests/interactive/border-radius.js
+++ b/tests/interactive/border-radius.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/border-width.js b/tests/interactive/border-width.js
index 30c7575a01002c4523e4f3f5ad8a003e03031aae..cb84187e09838b5e5ecbb7ddda33f05ccf43bdc9 100644 (file)
--- a/tests/interactive/border-width.js
+++ b/tests/interactive/border-width.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 4812acbfa9d446e363f947f238035f6952bf6305..23212e4fb03ca96d3b81aa2492b5bda071c64a32 100644 (file)
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/box-layout.js b/tests/interactive/box-layout.js
index bb9a5bbc2adeb28fc9a8024ea4e5105d2f3c3323..5eb83a46be546aa67188637f811ae5c2658c3c7f 100644 (file)
--- a/tests/interactive/box-layout.js
+++ b/tests/interactive/box-layout.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/box-shadow-animated.js b/tests/interactive/box-shadow-animated.js
index cf117a7f3a018a68fac80b1f9fd417c0a73ec859..6e96c43b609d216ace2092be88f7d4a21474c431 100644 (file)
--- a/tests/interactive/box-shadow-animated.js
+++ b/tests/interactive/box-shadow-animated.js
@@ -2,7 +2,9 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, GLib, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 const DELAY = 2000;
 

diff --git a/tests/interactive/box-shadows.js b/tests/interactive/box-shadows.js
index c9c677c97f629a2f5f746099bc83d6af3017cd61..4a14df1c98df5c8b0839f21c7f9f503e4761a597 100644 (file)
--- a/tests/interactive/box-shadows.js
+++ b/tests/interactive/box-shadows.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 640, height: 480 });

diff --git a/tests/interactive/calendar.js b/tests/interactive/calendar.js
index d1d435a528b8847bb21f73f74a743d06ffdb8eb7..bc263867dbfce81db32fef36239c9993feb3b4e9 100644 (file)
--- a/tests/interactive/calendar.js
+++ b/tests/interactive/calendar.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

diff --git a/tests/interactive/css-fonts.js b/tests/interactive/css-fonts.js
index a25769318f8c7fe38c3b1836d645b835f2ba5fee..56c19055da15d7b27aa4069a3a2542c0da476b96 100644 (file)
--- a/tests/interactive/css-fonts.js
+++ b/tests/interactive/css-fonts.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/entry.js b/tests/interactive/entry.js
index 9ae010604e63166a9ea25dd80ad450c07db1f293..59b037505a886524c969846de400437b0c5e748c 100644 (file)
--- a/tests/interactive/entry.js
+++ b/tests/interactive/entry.js
@@ -2,7 +2,9 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, GLib, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage({ width: 400, height: 400 });

diff --git a/tests/interactive/icons.js b/tests/interactive/icons.js
index 65b7f656090442ca70c169fcc305937995c23b85..55afdbf2b3f888a3c69866665f50b10238a14b45 100644 (file)
--- a/tests/interactive/icons.js
+++ b/tests/interactive/icons.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/inline-style.js b/tests/interactive/inline-style.js
index 3952c3a9844ae2f7e0c1297c79366450a3608cc6..2f9000579dfb064cf25299d493086c995f9a5e9b 100644 (file)
--- a/tests/interactive/inline-style.js
+++ b/tests/interactive/inline-style.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js
index be929a4f4ce422d86f4b0079dafee3bcddebcbb9..dfc8118ec4b6448c5128038fbe7f2be1b9d53ebb 100644 (file)
--- a/tests/interactive/scroll-view-sizing.js
+++ b/tests/interactive/scroll-view-sizing.js
@@ -2,7 +2,10 @@
 
 const UI = imports.testcommon.ui;
 
-const {Clutter, GObject, Shell, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const GObject = imports.gi.GObject;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 
 // This is an interactive test of the sizing behavior of StScrollView. It
 // may be interesting in the future to split out the two classes at the

diff --git a/tests/interactive/scrolling.js b/tests/interactive/scrolling.js
index ab526f97e526b8c05d9c47e461501f16905d36ae..d16643ad28bb72f1bc119f0f0a60679a68471feb 100644 (file)
--- a/tests/interactive/scrolling.js
+++ b/tests/interactive/scrolling.js
@@ -2,7 +2,9 @@
 
 const UI = imports.testcommon.ui;
 
-const {Clutter, St} = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/interactive/test-title.js b/tests/interactive/test-title.js
index a147a3a2935b4b2f304ec316616eb61ef6c97546..415c3ce80c5b416f54b741e0ab42a204b71b9567 100755 (executable)
--- a/tests/interactive/test-title.js
+++ b/tests/interactive/test-title.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env gjs
 
 imports.gi.versions.Gtk = '4.0';
-const {Gtk} = imports.gi;
+const Gtk = imports.gi.Gtk;
 
 function nextTitle() {
     let length = Math.random() * 20;

diff --git a/tests/interactive/transitions.js b/tests/interactive/transitions.js
index 7b2eac1c738f6c80535eb28fd36b6fddc0fb5155..acb5db479308266e4ecb6ec969a3bec8d113d1a1 100644 (file)
--- a/tests/interactive/transitions.js
+++ b/tests/interactive/transitions.js
@@ -2,7 +2,8 @@
 
 const UI = imports.testcommon.ui;
 
-const { Clutter, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
 
 function test() {
     let stage = new Clutter.Stage();

diff --git a/tests/testcommon/ui.js b/tests/testcommon/ui.js
index d426c0b38ef52304236dda285dd1f32bf638acb4..d98b9f9394ad689230ecedd78992c5a88162cd04 100644 (file)
--- a/tests/testcommon/ui.js
+++ b/tests/testcommon/ui.js
@@ -4,7 +4,10 @@ const Config = imports.misc.config;
 
 imports.gi.versions = {Clutter: Config.LIBMUTTER_API_VERSION};
 
-const { Clutter, Gio, GLib, St } = imports.gi;
+const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 const Environment = imports.ui.environment;
 

diff --git a/tests/unit/signalTracker.js b/tests/unit/signalTracker.js
index 7943d0a20f468380447abc6691a40cf28a64a5ca..6499a0f8e918a0b115572be032747cd7c5261b69 100644 (file)
--- a/tests/unit/signalTracker.js
+++ b/tests/unit/signalTracker.js
@@ -2,7 +2,7 @@
 
 // Test cases for version comparison
 
-const { GObject } = imports.gi;
+const GObject = imports.gi.GObject;
 
 const JsUnit = imports.jsUnit;
 const Signals = imports.misc.signals;